diff options
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_fp.c')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c index 4f401f753f8e..75e811810d0b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fp.c +++ b/drivers/scsi/megaraid/megaraid_sas_fp.c | |||
@@ -126,17 +126,17 @@ static u8 MR_LdDataArmGet(u32 ld, u32 armIdx, struct MR_FW_RAID_MAP_ALL *map) | |||
126 | return map->raidMap.ldSpanMap[ld].dataArmMap[armIdx]; | 126 | return map->raidMap.ldSpanMap[ld].dataArmMap[armIdx]; |
127 | } | 127 | } |
128 | 128 | ||
129 | static u16 MR_ArPdGet(u32 ar, u32 arm, struct MR_FW_RAID_MAP_ALL *map) | 129 | u16 MR_ArPdGet(u32 ar, u32 arm, struct MR_FW_RAID_MAP_ALL *map) |
130 | { | 130 | { |
131 | return map->raidMap.arMapInfo[ar].pd[arm]; | 131 | return map->raidMap.arMapInfo[ar].pd[arm]; |
132 | } | 132 | } |
133 | 133 | ||
134 | static u16 MR_LdSpanArrayGet(u32 ld, u32 span, struct MR_FW_RAID_MAP_ALL *map) | 134 | u16 MR_LdSpanArrayGet(u32 ld, u32 span, struct MR_FW_RAID_MAP_ALL *map) |
135 | { | 135 | { |
136 | return map->raidMap.ldSpanMap[ld].spanBlock[span].span.arrayRef; | 136 | return map->raidMap.ldSpanMap[ld].spanBlock[span].span.arrayRef; |
137 | } | 137 | } |
138 | 138 | ||
139 | static u16 MR_PdDevHandleGet(u32 pd, struct MR_FW_RAID_MAP_ALL *map) | 139 | u16 MR_PdDevHandleGet(u32 pd, struct MR_FW_RAID_MAP_ALL *map) |
140 | { | 140 | { |
141 | return map->raidMap.devHndlInfo[pd].curDevHdl; | 141 | return map->raidMap.devHndlInfo[pd].curDevHdl; |
142 | } | 142 | } |
@@ -784,7 +784,7 @@ u8 | |||
784 | MR_BuildRaidContext(struct megasas_instance *instance, | 784 | MR_BuildRaidContext(struct megasas_instance *instance, |
785 | struct IO_REQUEST_INFO *io_info, | 785 | struct IO_REQUEST_INFO *io_info, |
786 | struct RAID_CONTEXT *pRAID_Context, | 786 | struct RAID_CONTEXT *pRAID_Context, |
787 | struct MR_FW_RAID_MAP_ALL *map) | 787 | struct MR_FW_RAID_MAP_ALL *map, u8 **raidLUN) |
788 | { | 788 | { |
789 | struct MR_LD_RAID *raid; | 789 | struct MR_LD_RAID *raid; |
790 | u32 ld, stripSize, stripe_mask; | 790 | u32 ld, stripSize, stripe_mask; |
@@ -977,6 +977,9 @@ MR_BuildRaidContext(struct megasas_instance *instance, | |||
977 | pRAID_Context->regLockRowLBA = regStart; | 977 | pRAID_Context->regLockRowLBA = regStart; |
978 | pRAID_Context->regLockLength = regSize; | 978 | pRAID_Context->regLockLength = regSize; |
979 | pRAID_Context->configSeqNum = raid->seqNum; | 979 | pRAID_Context->configSeqNum = raid->seqNum; |
980 | /* save pointer to raid->LUN array */ | ||
981 | *raidLUN = raid->LUN; | ||
982 | |||
980 | 983 | ||
981 | /*Get Phy Params only if FP capable, or else leave it to MR firmware | 984 | /*Get Phy Params only if FP capable, or else leave it to MR firmware |
982 | to do the calculation.*/ | 985 | to do the calculation.*/ |