[PATCH review for 4.9 06/50] scsi: megaraid_sas: Do not set fp_possible if TM capable for non-RW syspdIO, change fp_possible to bool

[Levin, Alexander (Sasha Levin)]

From: Shivasharan S <shivasharan.srikanteshw...@broadcom.com>

[ Upstream commit 1d6dbd1752fb4347a4a5db06c8f5cd35dd1919f4 ]

FIX - firmware wants non-RW SYS PD IOs to avoid FastPath for better
tracking and other functionalities if the device is task management
capable.

Signed-off-by: Kashyap Desai <kashyap.de...@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshw...@broadcom.com>
Reviewed-by: Hannes Reinecke <h...@suse.com>
Reviewed-by: Tomas Henzl <the...@redhat.com>
Signed-off-by: Martin K. Petersen <martin.peter...@oracle.com>
Signed-off-by: Sasha Levin <alexander.le...@verizon.com>
---
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c 
b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index bd04bd01d34a..a156451553a7 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -1960,7 +1960,8 @@ static void megasas_build_ld_nonrw_fusion(struct 
megasas_instance *instance,
  */
 static void
 megasas_build_syspd_fusion(struct megasas_instance *instance,
-       struct scsi_cmnd *scmd, struct megasas_cmd_fusion *cmd, u8 fp_possible)
+       struct scsi_cmnd *scmd, struct megasas_cmd_fusion *cmd,
+       bool fp_possible)
 {
        u32 device_id;
        struct MPI2_RAID_SCSI_IO_REQUEST *io_request;
@@ -2064,6 +2065,8 @@ megasas_build_io_fusion(struct megasas_instance *instance,
        u16 sge_count;
        u8  cmd_type;
        struct MPI2_RAID_SCSI_IO_REQUEST *io_request = cmd->io_request;
+       struct MR_PRIV_DEVICE *mr_device_priv_data;
+       mr_device_priv_data = scp->device->hostdata;
 
        /* Zero out some fields so they don't get reused */
        memset(io_request->LUN, 0x0, 8);
@@ -2092,12 +2095,14 @@ megasas_build_io_fusion(struct megasas_instance 
*instance,
                megasas_build_ld_nonrw_fusion(instance, scp, cmd);
                break;
        case READ_WRITE_SYSPDIO:
+               megasas_build_syspd_fusion(instance, scp, cmd, true);
+               break;
        case NON_READ_WRITE_SYSPDIO:
-               if (instance->secure_jbod_support &&
-                       (cmd_type == NON_READ_WRITE_SYSPDIO))
-                       megasas_build_syspd_fusion(instance, scp, cmd, 0);
+               if (instance->secure_jbod_support ||
+                   mr_device_priv_data->is_tm_capable)
+                       megasas_build_syspd_fusion(instance, scp, cmd, false);
                else
-                       megasas_build_syspd_fusion(instance, scp, cmd, 1);
+                       megasas_build_syspd_fusion(instance, scp, cmd, true);
                break;
        default:
                break;
-- 
2.11.0