1 files changed, 18 insertions, 8 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
index 5a5af1fe7581..5255dd688aca 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -52,6 +52,7 @@
 #include <scsi/scsi_host.h>
 
 #include "megaraid_sas_fusion.h"
+#include "megaraid_sas.h"
 #include <asm/div64.h>
 
 #define ABS_DIFF(a, b)   (((a) > (b)) ? ((a) - (b)) : ((b) - (a)))
@@ -226,8 +227,9 @@ u32 MR_GetSpanBlock(u32 ld, u64 row, u64 *span_blk,
 *    span          - Span number
 *    block         - Absolute Block number in the physical disk
 */
-u8 MR_GetPhyParams(u32 ld, u64 stripRow, u16 stripRef, u64 *pdBlock,
-                   u16 *pDevHandle, struct RAID_CONTEXT *pRAID_Context,
+u8 MR_GetPhyParams(struct megasas_instance *instance, u32 ld, u64 stripRow,
+                   u16 stripRef, u64 *pdBlock, u16 *pDevHandle,
+                   struct RAID_CONTEXT *pRAID_Context,
                    struct MR_FW_RAID_MAP_ALL *map)
 {
         struct MR_LD_RAID  *raid = MR_LdRaidGet(ld, map);
@@ -279,7 +281,8 @@ u8 MR_GetPhyParams(u32 ld, u64 stripRow, u16 stripRef, u64 *pdBlock,
                 *pDevHandle = MR_PdDevHandleGet(pd, map);
         else {
                 *pDevHandle = MR_PD_INVALID; /* set dev handle as invalid. */
-                if (raid->level >= 5)
+                if ((raid->level >= 5) &&
+                    (instance->pdev->device != PCI_DEVICE_ID_LSI_INVADER))
                         pRAID_Context->regLockFlags = REGION_TYPE_EXCLUSIVE;
                 else if (raid->level == 1) {
                         /* Get alternate Pd. */
@@ -306,7 +309,8 @@ u8 MR_GetPhyParams(u32 ld, u64 stripRow, u16 stripRef, u64 *pdBlock,
 * This function will return 0 if region lock was acquired OR return num strips
 */
 u8
-MR_BuildRaidContext(struct IO_REQUEST_INFO *io_info,
+MR_BuildRaidContext(struct megasas_instance *instance,
+                    struct IO_REQUEST_INFO *io_info,
                     struct RAID_CONTEXT *pRAID_Context,
                     struct MR_FW_RAID_MAP_ALL *map)
 {
@@ -394,8 +398,12 @@ MR_BuildRaidContext(struct IO_REQUEST_INFO *io_info,
         }
 
         pRAID_Context->timeoutValue     = map->raidMap.fpPdIoTimeoutSec;
-        pRAID_Context->regLockFlags     = (isRead) ? REGION_TYPE_SHARED_READ :
-                raid->regTypeReqOnWrite;
+        if (instance->pdev->device == PCI_DEVICE_ID_LSI_INVADER)
+                pRAID_Context->regLockFlags = (isRead) ?
+                        raid->regTypeReqOnRead : raid->regTypeReqOnWrite;
+        else
+                pRAID_Context->regLockFlags = (isRead) ?
+                        REGION_TYPE_SHARED_READ : raid->regTypeReqOnWrite;
         pRAID_Context->VirtualDiskTgtId = raid->targetId;
         pRAID_Context->regLockRowLBA    = regStart;
         pRAID_Context->regLockLength    = regSize;
@@ -404,7 +412,8 @@ MR_BuildRaidContext(struct IO_REQUEST_INFO *io_info,
         /*Get Phy Params only if FP capable, or else leave it to MR firmware
           to do the calculation.*/
         if (io_info->fpOkForIo) {
-                retval = MR_GetPhyParams(ld, start_strip, ref_in_start_stripe,
+                retval = MR_GetPhyParams(instance, ld, start_strip,
+                                         ref_in_start_stripe,
                                          &io_info->pdBlock,
                                          &io_info->devHandle, pRAID_Context,
                                          map);
@@ -415,7 +424,8 @@ MR_BuildRaidContext(struct IO_REQUEST_INFO *io_info,
         } else if (isRead) {
                 uint stripIdx;
                 for (stripIdx = 0; stripIdx < num_strips; stripIdx++) {
-                        if (!MR_GetPhyParams(ld, start_strip + stripIdx,
+                        if (!MR_GetPhyParams(instance, ld,
+                                             start_strip + stripIdx,
                                              ref_in_start_stripe,
                                              &io_info->pdBlock,
                                              &io_info->devHandle,