Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d91d6e0 authored by Sumit.Saxena@avagotech.com's avatar Sumit.Saxena@avagotech.com Committed by Greg Kroah-Hartman
Browse files

megaraid_sas: dndinaness related bug fixes 



commit 6e755ddc2935d970574263db3eca547eb70e67d7 upstream.

This patch addresses few endianness related bug fixes.

Signed-off-by: default avatarSumit Saxena <sumit.saxena@avagotech.com>
Signed-off-by: default avatarKashyap Desai <kashyap.desai@avagotech.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 803bb7e9

drivers/scsi/megaraid/megaraid_sas_fp.c

+9 −8
Original line number Diff line number Diff line
@@ -183,14 +183,15 @@ void MR_PopulateDrvRaidMap(struct megasas_instance *instance) 
		/* New Raid map will not set totalSize, so keep expected value

		 * for legacy code in ValidateMapInfo

		 */

		pDrvRaidMap->totalSize = sizeof(struct MR_FW_RAID_MAP_EXT);

		pDrvRaidMap->totalSize =

			cpu_to_le32(sizeof(struct MR_FW_RAID_MAP_EXT));

	} else {

		fw_map_old = (struct MR_FW_RAID_MAP_ALL *)

			fusion->ld_map[(instance->map_id & 1)];

		pFwRaidMap = &fw_map_old->raidMap;



#if VD_EXT_DEBUG

		for (i = 0; i < pFwRaidMap->ldCount; i++) {

		for (i = 0; i < le16_to_cpu(pFwRaidMap->ldCount); i++) {

			dev_dbg(&instance->pdev->dev, "(%d) :Index 0x%x "

				"Target Id 0x%x Seq Num 0x%x Size 0/%llx\n",

				instance->unique_id, i,
@@ -202,12 +203,12 @@ void MR_PopulateDrvRaidMap(struct megasas_instance *instance) 


		memset(drv_map, 0, fusion->drv_map_sz);

		pDrvRaidMap->totalSize = pFwRaidMap->totalSize;

		pDrvRaidMap->ldCount = pFwRaidMap->ldCount;

		pDrvRaidMap->ldCount = (__le16)pFwRaidMap->ldCount;

		pDrvRaidMap->fpPdIoTimeoutSec = pFwRaidMap->fpPdIoTimeoutSec;

		for (i = 0; i < MAX_RAIDMAP_LOGICAL_DRIVES + MAX_RAIDMAP_VIEWS; i++)

			pDrvRaidMap->ldTgtIdToLd[i] =

				(u8)pFwRaidMap->ldTgtIdToLd[i];

		for (i = 0; i < pDrvRaidMap->ldCount; i++) {

		for (i = 0; i < le16_to_cpu(pDrvRaidMap->ldCount); i++) {

			pDrvRaidMap->ldSpanMap[i] = pFwRaidMap->ldSpanMap[i];

#if VD_EXT_DEBUG

			dev_dbg(&instance->pdev->dev,
@@ -268,7 +269,7 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance) 
	else

		expected_size =

			(sizeof(struct MR_FW_RAID_MAP) - sizeof(struct MR_LD_SPAN_MAP) +

			(sizeof(struct MR_LD_SPAN_MAP) * le32_to_cpu(pDrvRaidMap->ldCount)));

			(sizeof(struct MR_LD_SPAN_MAP) * le16_to_cpu(pDrvRaidMap->ldCount)));



	if (le32_to_cpu(pDrvRaidMap->totalSize) != expected_size) {

		dev_err(&instance->pdev->dev, "map info structure size 0x%x is not matching with ld count\n",
@@ -284,7 +285,7 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance) 


	mr_update_load_balance_params(drv_map, lbInfo);



	num_lds = le32_to_cpu(drv_map->raidMap.ldCount);

	num_lds = le16_to_cpu(drv_map->raidMap.ldCount);



	/*Convert Raid capability values to CPU arch */

	for (ldCount = 0; ldCount < num_lds; ldCount++) {
@@ -457,7 +458,7 @@ u32 mr_spanset_get_span_block(struct megasas_instance *instance, 
				quad = &map->raidMap.ldSpanMap[ld].

					spanBlock[span].

					block_span_info.quad[info];

				if (le32_to_cpu(quad->diff == 0))

				if (le32_to_cpu(quad->diff) == 0)

					return SPAN_INVALID;

				if (le64_to_cpu(quad->logStart) <= row  &&

					row <= le64_to_cpu(quad->logEnd)  &&
@@ -520,7 +521,7 @@ static u64 get_row_from_strip(struct megasas_instance *instance, 
				span_set->span_row_data_width) * span_set->diff;

		for (span = 0, span_offset = 0; span < raid->spanDepth; span++)

			if (le32_to_cpu(map->raidMap.ldSpanMap[ld].spanBlock[span].

				block_span_info.noElements >= info+1)) {

				block_span_info.noElements) >= info+1) {

				if (strip_offset >=

					span_set->strip_offset[span])

					span_offset++;

drivers/scsi/megaraid/megaraid_sas_fusion.c

+7 −6
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ megasas_sync_map_info(struct megasas_instance *instance) 


	map = fusion->ld_drv_map[instance->map_id & 1];



	num_lds = le32_to_cpu(map->raidMap.ldCount);

	num_lds = le16_to_cpu(map->raidMap.ldCount);



	dcmd = &cmd->frame->dcmd;
@@ -1173,9 +1173,10 @@ megasas_fire_cmd_fusion(struct megasas_instance *instance, 
			struct megasas_register_set __iomem *regs)

{

#if defined(writeq) && defined(CONFIG_64BIT)

	u64 req_data = (((u64)req_desc_hi << 32) | (u32)req_desc_lo);

	u64 req_data = (((u64)le32_to_cpu(req_desc_hi) << 32) |

			le32_to_cpu(req_desc_lo));



	writeq(le64_to_cpu(req_data), &(regs)->inbound_low_queue_port);

	writeq(req_data, &(regs)->inbound_low_queue_port);

#else

	unsigned long flags;
@@ -1373,7 +1374,7 @@ megasas_set_pd_lba(struct MPI2_RAID_SCSI_IO_REQUEST *io_request, u8 cdb_len, 
		/* Logical block reference tag */

		io_request->CDB.EEDP32.PrimaryReferenceTag =

			cpu_to_be32(ref_tag);

		io_request->CDB.EEDP32.PrimaryApplicationTagMask = 0xffff;

		io_request->CDB.EEDP32.PrimaryApplicationTagMask = cpu_to_be16(0xffff);

		io_request->IoFlags = cpu_to_le16(32); /* Specify 32-byte cdb */



		/* Transfer length */
@@ -1769,7 +1770,7 @@ megasas_build_dcdb_fusion(struct megasas_instance *instance, 


		/* set RAID context values */

		pRAID_Context->regLockFlags     = REGION_TYPE_SHARED_READ;

		pRAID_Context->timeoutValue     = raid->fpIoTimeoutForLd;

		pRAID_Context->timeoutValue     = cpu_to_le16(raid->fpIoTimeoutForLd);

		pRAID_Context->VirtualDiskTgtId = cpu_to_le16(device_id);

		pRAID_Context->regLockRowLBA    = 0;

		pRAID_Context->regLockLength    = 0;
@@ -2254,7 +2255,7 @@ build_mpt_mfi_pass_thru(struct megasas_instance *instance, 
	 * megasas_complete_cmd

	 */



	if (frame_hdr->flags & MFI_FRAME_DONT_POST_IN_REPLY_QUEUE)

	if (frame_hdr->flags & cpu_to_le16(MFI_FRAME_DONT_POST_IN_REPLY_QUEUE))

		cmd->flags = MFI_FRAME_DONT_POST_IN_REPLY_QUEUE;



	fusion = instance->ctrl_context;