ignatenkobrain / rpms / kernel

Forked from rpms/kernel 3 years ago
Clone
b312fc
From a28d10b2a9bec8714f59e12fe7fb53bfe8c6ef17 Mon Sep 17 00:00:00 2001
b312fc
From: Sasikumar Chandrasekaran <sasikumar.pc@broadcom.com>
b312fc
Date: Tue, 10 Jan 2017 18:20:46 -0500
b312fc
Subject: [PATCH 04/11] scsi: megaraid_sas: SAS3.5 Generic Megaraid Controllers
b312fc
 Stream Detection and IO Coalescing
b312fc
b312fc
Detect sequential Write IOs and pass the hint that it is part of sequential
b312fc
stream to help HBA Firmware do the Full Stripe Writes. For read IOs on
b312fc
certain RAID volumes like Read Ahead volumes,this will help driver to
b312fc
send it to Firmware even if the IOs can potentially be sent to
b312fc
hardware directly (called fast path) bypassing firmware.
b312fc
b312fc
Design: 8 streams are maintained per RAID volume as per the combined
b312fc
firmware/driver design. When there is no stream detected the LRU stream
b312fc
is used for next potential stream and LRU/MRU map is updated to make this
b312fc
as MRU stream. Every time a stream is detected the MRU map
b312fc
is updated to make the current stream as MRU stream.
b312fc
b312fc
Signed-off-by: Sasikumar Chandrasekaran <sasikumar.pc@broadcom.com>
b312fc
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
b312fc
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
b312fc
---
b312fc
 drivers/scsi/megaraid/megaraid_sas.h        |   1 +
b312fc
 drivers/scsi/megaraid/megaraid_sas_base.c   |  43 +++++++-
b312fc
 drivers/scsi/megaraid/megaraid_sas_fp.c     |   2 +
b312fc
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 165 +++++++++++++++++++++++-----
b312fc
 drivers/scsi/megaraid/megaraid_sas_fusion.h | 117 +++++++++++++++++++-
b312fc
 5 files changed, 297 insertions(+), 31 deletions(-)
b312fc
b312fc
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
b312fc
index ccef47b..f387b32 100644
b312fc
--- a/drivers/scsi/megaraid/megaraid_sas.h
b312fc
+++ b/drivers/scsi/megaraid/megaraid_sas.h
b312fc
@@ -2070,6 +2070,7 @@ struct megasas_instance {
b312fc
 	/* used to sync fire the cmd to fw */
b312fc
 	spinlock_t hba_lock;
b312fc
 	/* used to synch producer, consumer ptrs in dpc */
b312fc
+	spinlock_t stream_lock;
b312fc
 	spinlock_t completion_lock;
b312fc
 	struct dma_pool *frame_dma_pool;
b312fc
 	struct dma_pool *sense_dma_pool;
b312fc
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
b312fc
index c78d7ee..0722286 100644
b312fc
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
b312fc
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
b312fc
@@ -5048,7 +5048,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
b312fc
 	struct megasas_register_set __iomem *reg_set;
b312fc
 	struct megasas_ctrl_info *ctrl_info = NULL;
b312fc
 	unsigned long bar_list;
b312fc
-	int i, loop, fw_msix_count = 0;
b312fc
+	int i, j, loop, fw_msix_count = 0;
b312fc
 	struct IOV_111 *iovPtr;
b312fc
 	struct fusion_context *fusion;
b312fc
 
b312fc
@@ -5235,6 +5235,36 @@ static int megasas_init_fw(struct megasas_instance *instance)
b312fc
 	}
b312fc
 
b312fc
 	memset(instance->ld_ids, 0xff, MEGASAS_MAX_LD_IDS);
b312fc
+
b312fc
+	/* stream detection initialization */
b312fc
+	if (instance->is_ventura) {
b312fc
+		fusion->stream_detect_by_ld =
b312fc
+		kzalloc(sizeof(struct LD_STREAM_DETECT *)
b312fc
+		* MAX_LOGICAL_DRIVES_EXT,
b312fc
+		GFP_KERNEL);
b312fc
+		if (!fusion->stream_detect_by_ld) {
b312fc
+			dev_err(&instance->pdev->dev,
b312fc
+					"unable to allocate stream detection for pool of LDs\n");
b312fc
+			goto fail_get_ld_pd_list;
b312fc
+		}
b312fc
+		for (i = 0; i < MAX_LOGICAL_DRIVES_EXT; ++i) {
b312fc
+			fusion->stream_detect_by_ld[i] =
b312fc
+				kmalloc(sizeof(struct LD_STREAM_DETECT),
b312fc
+				GFP_KERNEL);
b312fc
+			if (!fusion->stream_detect_by_ld[i]) {
b312fc
+				dev_err(&instance->pdev->dev,
b312fc
+					"unable to allocate stream detect by LD\n ");
b312fc
+				for (j = 0; j < i; ++j)
b312fc
+					kfree(fusion->stream_detect_by_ld[j]);
b312fc
+				kfree(fusion->stream_detect_by_ld);
b312fc
+				fusion->stream_detect_by_ld = NULL;
b312fc
+				goto fail_get_ld_pd_list;
b312fc
+			}
b312fc
+			fusion->stream_detect_by_ld[i]->mru_bit_map
b312fc
+				= MR_STREAM_BITMAP;
b312fc
+		}
b312fc
+	}
b312fc
+
b312fc
 	if (megasas_ld_list_query(instance,
b312fc
 				  MR_LD_QUERY_TYPE_EXPOSED_TO_HOST))
b312fc
 		megasas_get_ld_list(instance);
b312fc
@@ -5354,6 +5384,8 @@ static int megasas_init_fw(struct megasas_instance *instance)
b312fc
 
b312fc
 	return 0;
b312fc
 
b312fc
+fail_get_ld_pd_list:
b312fc
+	instance->instancet->disable_intr(instance);
b312fc
 fail_get_pd_list:
b312fc
 	instance->instancet->disable_intr(instance);
b312fc
 	megasas_destroy_irqs(instance);
b312fc
@@ -5896,6 +5928,7 @@ static int megasas_probe_one(struct pci_dev *pdev,
b312fc
 
b312fc
 	spin_lock_init(&instance->mfi_pool_lock);
b312fc
 	spin_lock_init(&instance->hba_lock);
b312fc
+	spin_lock_init(&instance->stream_lock);
b312fc
 	spin_lock_init(&instance->completion_lock);
b312fc
 
b312fc
 	mutex_init(&instance->reset_mutex);
b312fc
@@ -6363,6 +6396,14 @@ static void megasas_detach_one(struct pci_dev *pdev)
b312fc
 	if (instance->msix_vectors)
b312fc
 		pci_disable_msix(instance->pdev);
b312fc
 
b312fc
+	if (instance->is_ventura) {
b312fc
+		for (i = 0; i < MAX_LOGICAL_DRIVES_EXT; ++i)
b312fc
+			kfree(fusion->stream_detect_by_ld[i]);
b312fc
+		kfree(fusion->stream_detect_by_ld);
b312fc
+		fusion->stream_detect_by_ld = NULL;
b312fc
+	}
b312fc
+
b312fc
+
b312fc
 	if (instance->ctrl_context) {
b312fc
 		megasas_release_fusion(instance);
b312fc
 			pd_seq_map_sz = sizeof(struct MR_PD_CFG_SEQ_NUM_SYNC) +
b312fc
diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
b312fc
index e413113..fe5b074 100644
b312fc
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
b312fc
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
b312fc
@@ -933,6 +933,8 @@ MR_BuildRaidContext(struct megasas_instance *instance,
b312fc
 
b312fc
 	ld = MR_TargetIdToLdGet(ldTgtId, map);
b312fc
 	raid = MR_LdRaidGet(ld, map);
b312fc
+	/*check read ahead bit*/
b312fc
+	io_info->ra_capable = raid->capability.ra_capable;
b312fc
 
b312fc
 	/*
b312fc
 	 * if rowDataSize @RAID map and spanRowDataSize @SPAN INFO are zero
b312fc
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
b312fc
index 27c6a1f..946f7c0 100644
b312fc
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
b312fc
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
b312fc
@@ -1704,6 +1704,90 @@ megasas_set_pd_lba(struct MPI2_RAID_SCSI_IO_REQUEST *io_request, u8 cdb_len,
b312fc
 }
b312fc
 
b312fc
 /**
b312fc
+ * megasas_stream_detect -	stream detection on read and and write IOs
b312fc
+ * @instance:		Adapter soft state
b312fc
+ * @cmd:		    Command to be prepared
b312fc
+ * @io_info:		IO Request info
b312fc
+ *
b312fc
+ */
b312fc
+
b312fc
+/** stream detection on read and and write IOs */
b312fc
+static void megasas_stream_detect(struct megasas_instance *instance,
b312fc
+				struct megasas_cmd_fusion *cmd,
b312fc
+				struct IO_REQUEST_INFO *io_info)
b312fc
+{
b312fc
+	struct fusion_context *fusion = instance->ctrl_context;
b312fc
+	u32 device_id = io_info->ldTgtId;
b312fc
+	struct LD_STREAM_DETECT *current_ld_sd
b312fc
+		= fusion->stream_detect_by_ld[device_id];
b312fc
+	u32 *track_stream = &current_ld_sd->mru_bit_map, stream_num;
b312fc
+	u32 shifted_values, unshifted_values;
b312fc
+	u32 index_value_mask, shifted_values_mask;
b312fc
+	int i;
b312fc
+	bool is_read_ahead = false;
b312fc
+	struct STREAM_DETECT *current_sd;
b312fc
+	/* find possible stream */
b312fc
+	for (i = 0; i < MAX_STREAMS_TRACKED; ++i) {
b312fc
+		stream_num =
b312fc
+		(*track_stream >> (i * BITS_PER_INDEX_STREAM)) &
b312fc
+			STREAM_MASK;
b312fc
+		current_sd = &current_ld_sd->stream_track[stream_num];
b312fc
+	/* if we found a stream, update the raid
b312fc
+	 *  context and also update the mruBitMap
b312fc
+	 */
b312fc
+	/*	boundary condition */
b312fc
+	if ((current_sd->next_seq_lba) &&
b312fc
+		(io_info->ldStartBlock >= current_sd->next_seq_lba) &&
b312fc
+		(io_info->ldStartBlock <= (current_sd->next_seq_lba+32)) &&
b312fc
+		(current_sd->is_read == io_info->isRead)) {
b312fc
+
b312fc
+		if ((io_info->ldStartBlock != current_sd->next_seq_lba)
b312fc
+			&& ((!io_info->isRead) || (!is_read_ahead)))
b312fc
+			/*
b312fc
+			 * Once the API availible we need to change this.
b312fc
+			 * At this point we are not allowing any gap
b312fc
+			 */
b312fc
+			continue;
b312fc
+
b312fc
+		cmd->io_request->RaidContext.raid_context_g35.stream_detected = true;
b312fc
+		current_sd->next_seq_lba =
b312fc
+		io_info->ldStartBlock + io_info->numBlocks;
b312fc
+		/*
b312fc
+		 *	update the mruBitMap LRU
b312fc
+		 */
b312fc
+		shifted_values_mask =
b312fc
+			(1 <<  i * BITS_PER_INDEX_STREAM) - 1;
b312fc
+		shifted_values = ((*track_stream & shifted_values_mask)
b312fc
+					<< BITS_PER_INDEX_STREAM);
b312fc
+		index_value_mask =
b312fc
+			STREAM_MASK << i * BITS_PER_INDEX_STREAM;
b312fc
+		unshifted_values =
b312fc
+			*track_stream & ~(shifted_values_mask |
b312fc
+			index_value_mask);
b312fc
+		*track_stream =
b312fc
+			unshifted_values | shifted_values | stream_num;
b312fc
+		return;
b312fc
+
b312fc
+		}
b312fc
+
b312fc
+	}
b312fc
+	/*
b312fc
+	 * if we did not find any stream, create a new one
b312fc
+	 * from the least recently used
b312fc
+	 */
b312fc
+	stream_num =
b312fc
+	(*track_stream >> ((MAX_STREAMS_TRACKED - 1) * BITS_PER_INDEX_STREAM)) &
b312fc
+			STREAM_MASK;
b312fc
+	current_sd = &current_ld_sd->stream_track[stream_num];
b312fc
+	current_sd->is_read = io_info->isRead;
b312fc
+	current_sd->next_seq_lba = io_info->ldStartBlock + io_info->numBlocks;
b312fc
+	*track_stream =
b312fc
+	(((*track_stream & ZERO_LAST_STREAM) << 4) | stream_num);
b312fc
+	return;
b312fc
+
b312fc
+}
b312fc
+
b312fc
+/**
b312fc
  * megasas_build_ldio_fusion -	Prepares IOs to devices
b312fc
  * @instance:		Adapter soft state
b312fc
  * @scp:		SCSI command
b312fc
@@ -1725,15 +1809,17 @@ megasas_build_ldio_fusion(struct megasas_instance *instance,
b312fc
 	struct fusion_context *fusion;
b312fc
 	struct MR_DRV_RAID_MAP_ALL *local_map_ptr;
b312fc
 	u8 *raidLUN;
b312fc
+	unsigned long spinlock_flags;
b312fc
 
b312fc
 	device_id = MEGASAS_DEV_INDEX(scp);
b312fc
 
b312fc
 	fusion = instance->ctrl_context;
b312fc
 
b312fc
 	io_request = cmd->io_request;
b312fc
-	io_request->RaidContext.VirtualDiskTgtId = cpu_to_le16(device_id);
b312fc
-	io_request->RaidContext.status = 0;
b312fc
-	io_request->RaidContext.exStatus = 0;
b312fc
+	io_request->RaidContext.raid_context.VirtualDiskTgtId =
b312fc
+		cpu_to_le16(device_id);
b312fc
+	io_request->RaidContext.raid_context.status = 0;
b312fc
+	io_request->RaidContext.raid_context.exStatus = 0;
b312fc
 
b312fc
 	req_desc = (union MEGASAS_REQUEST_DESCRIPTOR_UNION *)cmd->request_desc;
b312fc
 
b312fc
@@ -1804,11 +1890,11 @@ megasas_build_ldio_fusion(struct megasas_instance *instance,
b312fc
 
b312fc
 	if ((MR_TargetIdToLdGet(device_id, local_map_ptr) >=
b312fc
 		instance->fw_supported_vd_count) || (!fusion->fast_path_io)) {
b312fc
-		io_request->RaidContext.regLockFlags  = 0;
b312fc
+		io_request->RaidContext.raid_context.regLockFlags  = 0;
b312fc
 		fp_possible = 0;
b312fc
 	} else {
b312fc
 		if (MR_BuildRaidContext(instance, &io_info,
b312fc
-					&io_request->RaidContext,
b312fc
+					&io_request->RaidContext.raid_context,
b312fc
 					local_map_ptr, &raidLUN))
b312fc
 			fp_possible = io_info.fpOkForIo;
b312fc
 	}
b312fc
@@ -1819,6 +1905,18 @@ megasas_build_ldio_fusion(struct megasas_instance *instance,
b312fc
 	cmd->request_desc->SCSIIO.MSIxIndex = instance->msix_vectors ?
b312fc
 		raw_smp_processor_id() % instance->msix_vectors : 0;
b312fc
 
b312fc
+	if (instance->is_ventura) {
b312fc
+		spin_lock_irqsave(&instance->stream_lock, spinlock_flags);
b312fc
+		megasas_stream_detect(instance, cmd, &io_info);
b312fc
+		spin_unlock_irqrestore(&instance->stream_lock, spinlock_flags);
b312fc
+		/* In ventura if stream detected for a read and it is read ahead
b312fc
+		 *  capable make this IO as LDIO
b312fc
+		 */
b312fc
+		if (io_request->RaidContext.raid_context_g35.stream_detected &&
b312fc
+				io_info.isRead && io_info.ra_capable)
b312fc
+			fp_possible = false;
b312fc
+	}
b312fc
+
b312fc
 	if (fp_possible) {
b312fc
 		megasas_set_pd_lba(io_request, scp->cmd_len, &io_info, scp,
b312fc
 				   local_map_ptr, start_lba_lo);
b312fc
@@ -1827,15 +1925,16 @@ megasas_build_ldio_fusion(struct megasas_instance *instance,
b312fc
 			(MPI2_REQ_DESCRIPT_FLAGS_FP_IO
b312fc
 			 << MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);
b312fc
 		if (fusion->adapter_type == INVADER_SERIES) {
b312fc
-			if (io_request->RaidContext.regLockFlags ==
b312fc
+			if (io_request->RaidContext.raid_context.regLockFlags ==
b312fc
 			    REGION_TYPE_UNUSED)
b312fc
 				cmd->request_desc->SCSIIO.RequestFlags =
b312fc
 					(MEGASAS_REQ_DESCRIPT_FLAGS_NO_LOCK <<
b312fc
 					MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);
b312fc
-			io_request->RaidContext.Type = MPI2_TYPE_CUDA;
b312fc
-			io_request->RaidContext.nseg = 0x1;
b312fc
+			io_request->RaidContext.raid_context.Type
b312fc
+				= MPI2_TYPE_CUDA;
b312fc
+			io_request->RaidContext.raid_context.nseg = 0x1;
b312fc
 			io_request->IoFlags |= cpu_to_le16(MPI25_SAS_DEVICE0_FLAGS_ENABLED_FAST_PATH);
b312fc
-			io_request->RaidContext.regLockFlags |=
b312fc
+			io_request->RaidContext.raid_context.regLockFlags |=
b312fc
 			  (MR_RL_FLAGS_GRANT_DESTINATION_CUDA |
b312fc
 			   MR_RL_FLAGS_SEQ_NUM_ENABLE);
b312fc
 		}
b312fc
@@ -1862,22 +1961,24 @@ megasas_build_ldio_fusion(struct megasas_instance *instance,
b312fc
 		/* populate the LUN field */
b312fc
 		memcpy(io_request->LUN, raidLUN, 8);
b312fc
 	} else {
b312fc
-		io_request->RaidContext.timeoutValue =
b312fc
+		io_request->RaidContext.raid_context.timeoutValue =
b312fc
 			cpu_to_le16(local_map_ptr->raidMap.fpPdIoTimeoutSec);
b312fc
 		cmd->request_desc->SCSIIO.RequestFlags =
b312fc
 			(MEGASAS_REQ_DESCRIPT_FLAGS_LD_IO
b312fc
 			 << MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);
b312fc
 		if (fusion->adapter_type == INVADER_SERIES) {
b312fc
 			if (io_info.do_fp_rlbypass ||
b312fc
-				(io_request->RaidContext.regLockFlags == REGION_TYPE_UNUSED))
b312fc
+			(io_request->RaidContext.raid_context.regLockFlags
b312fc
+					== REGION_TYPE_UNUSED))
b312fc
 				cmd->request_desc->SCSIIO.RequestFlags =
b312fc
 					(MEGASAS_REQ_DESCRIPT_FLAGS_NO_LOCK <<
b312fc
 					MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);
b312fc
-			io_request->RaidContext.Type = MPI2_TYPE_CUDA;
b312fc
-			io_request->RaidContext.regLockFlags |=
b312fc
+			io_request->RaidContext.raid_context.Type
b312fc
+				= MPI2_TYPE_CUDA;
b312fc
+			io_request->RaidContext.raid_context.regLockFlags |=
b312fc
 				(MR_RL_FLAGS_GRANT_DESTINATION_CPU0 |
b312fc
 				 MR_RL_FLAGS_SEQ_NUM_ENABLE);
b312fc
-			io_request->RaidContext.nseg = 0x1;
b312fc
+			io_request->RaidContext.raid_context.nseg = 0x1;
b312fc
 		}
b312fc
 		io_request->Function = MEGASAS_MPI2_FUNCTION_LD_IO_REQUEST;
b312fc
 		io_request->DevHandle = cpu_to_le16(device_id);
b312fc
@@ -1913,7 +2014,7 @@ static void megasas_build_ld_nonrw_fusion(struct megasas_instance *instance,
b312fc
 	local_map_ptr = fusion->ld_drv_map[(instance->map_id & 1)];
b312fc
 	io_request->DataLength = cpu_to_le32(scsi_bufflen(scmd));
b312fc
 	/* get RAID_Context pointer */
b312fc
-	pRAID_Context = &io_request->RaidContext;
b312fc
+	pRAID_Context = &io_request->RaidContext.raid_context;
b312fc
 	/* Check with FW team */
b312fc
 	pRAID_Context->VirtualDiskTgtId = cpu_to_le16(device_id);
b312fc
 	pRAID_Context->regLockRowLBA    = 0;
b312fc
@@ -2000,7 +2101,7 @@ megasas_build_syspd_fusion(struct megasas_instance *instance,
b312fc
 
b312fc
 	io_request = cmd->io_request;
b312fc
 	/* get RAID_Context pointer */
b312fc
-	pRAID_Context = &io_request->RaidContext;
b312fc
+	pRAID_Context = &io_request->RaidContext.raid_context;
b312fc
 	pRAID_Context->regLockFlags = 0;
b312fc
 	pRAID_Context->regLockRowLBA = 0;
b312fc
 	pRAID_Context->regLockLength = 0;
b312fc
@@ -2094,9 +2195,9 @@ megasas_build_io_fusion(struct megasas_instance *instance,
b312fc
 	io_request->Control = 0;
b312fc
 	io_request->EEDPBlockSize = 0;
b312fc
 	io_request->ChainOffset = 0;
b312fc
-	io_request->RaidContext.RAIDFlags = 0;
b312fc
-	io_request->RaidContext.Type = 0;
b312fc
-	io_request->RaidContext.nseg = 0;
b312fc
+	io_request->RaidContext.raid_context.RAIDFlags = 0;
b312fc
+	io_request->RaidContext.raid_context.Type = 0;
b312fc
+	io_request->RaidContext.raid_context.nseg = 0;
b312fc
 
b312fc
 	memcpy(io_request->CDB.CDB32, scp->cmnd, scp->cmd_len);
b312fc
 	/*
b312fc
@@ -2143,8 +2244,8 @@ megasas_build_io_fusion(struct megasas_instance *instance,
b312fc
 	/* numSGE store lower 8 bit of sge_count.
b312fc
 	 * numSGEExt store higher 8 bit of sge_count
b312fc
 	 */
b312fc
-	io_request->RaidContext.numSGE = sge_count;
b312fc
-	io_request->RaidContext.numSGEExt = (u8)(sge_count >> 8);
b312fc
+	io_request->RaidContext.raid_context.numSGE = sge_count;
b312fc
+	io_request->RaidContext.raid_context.numSGEExt = (u8)(sge_count >> 8);
b312fc
 
b312fc
 	io_request->SGLFlags = cpu_to_le16(MPI2_SGE_FLAGS_64_BIT_ADDRESSING);
b312fc
 
b312fc
@@ -2303,8 +2404,8 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex)
b312fc
 			cmd_fusion->scmd->SCp.ptr = NULL;
b312fc
 
b312fc
 		scmd_local = cmd_fusion->scmd;
b312fc
-		status = scsi_io_req->RaidContext.status;
b312fc
-		extStatus = scsi_io_req->RaidContext.exStatus;
b312fc
+		status = scsi_io_req->RaidContext.raid_context.status;
b312fc
+		extStatus = scsi_io_req->RaidContext.raid_context.exStatus;
b312fc
 
b312fc
 		switch (scsi_io_req->Function) {
b312fc
 		case MPI2_FUNCTION_SCSI_TASK_MGMT:
b312fc
@@ -2337,8 +2438,8 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex)
b312fc
 		case MEGASAS_MPI2_FUNCTION_LD_IO_REQUEST: /* LD-IO Path */
b312fc
 			/* Map the FW Cmd Status */
b312fc
 			map_cmd_status(cmd_fusion, status, extStatus);
b312fc
-			scsi_io_req->RaidContext.status = 0;
b312fc
-			scsi_io_req->RaidContext.exStatus = 0;
b312fc
+			scsi_io_req->RaidContext.raid_context.status = 0;
b312fc
+			scsi_io_req->RaidContext.raid_context.exStatus = 0;
b312fc
 			if (megasas_cmd_type(scmd_local) == READ_WRITE_LDIO)
b312fc
 				atomic_dec(&instance->ldio_outstanding);
b312fc
 			megasas_return_cmd_fusion(instance, cmd_fusion);
b312fc
@@ -2901,7 +3002,7 @@ void megasas_refire_mgmt_cmd(struct megasas_instance *instance)
b312fc
 				&& !(cmd_mfi->flags & DRV_DCMD_SKIP_REFIRE);
b312fc
 		if (refire_cmd)
b312fc
 			megasas_fire_cmd_fusion(instance, req_desc,
b312fc
-							instance->is_ventura);
b312fc
+				instance->is_ventura);
b312fc
 		else
b312fc
 			megasas_return_cmd(instance, cmd_mfi);
b312fc
 	}
b312fc
@@ -3390,7 +3491,7 @@ int megasas_check_mpio_paths(struct megasas_instance *instance,
b312fc
 /* Core fusion reset function */
b312fc
 int megasas_reset_fusion(struct Scsi_Host *shost, int reason)
b312fc
 {
b312fc
-	int retval = SUCCESS, i, convert = 0;
b312fc
+	int retval = SUCCESS, i, j, convert = 0;
b312fc
 	struct megasas_instance *instance;
b312fc
 	struct megasas_cmd_fusion *cmd_fusion;
b312fc
 	struct fusion_context *fusion;
b312fc
@@ -3555,6 +3656,16 @@ transition_to_ready:
b312fc
 			shost_for_each_device(sdev, shost)
b312fc
 				megasas_update_sdev_properties(sdev);
b312fc
 
b312fc
+			/* reset stream detection array */
b312fc
+			if (instance->is_ventura) {
b312fc
+				for (j = 0; j < MAX_LOGICAL_DRIVES_EXT; ++j) {
b312fc
+					memset(fusion->stream_detect_by_ld[j],
b312fc
+					0, sizeof(struct LD_STREAM_DETECT));
b312fc
+				 fusion->stream_detect_by_ld[j]->mru_bit_map
b312fc
+						= MR_STREAM_BITMAP;
b312fc
+				}
b312fc
+			}
b312fc
+
b312fc
 			clear_bit(MEGASAS_FUSION_IN_RESET,
b312fc
 				  &instance->reset_flags);
b312fc
 			instance->instancet->enable_intr(instance);
b312fc
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h
b312fc
index 3cd3d0a..d9cf496 100644
b312fc
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.h
b312fc
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h
b312fc
@@ -133,12 +133,95 @@ struct RAID_CONTEXT {
b312fc
 	u8      resvd2;
b312fc
 };
b312fc
 
b312fc
+/*
b312fc
+ * Raid Context structure which describes ventura MegaRAID specific
b312fc
+ * IO Paramenters ,This resides at offset 0x60 where the SGL normally
b312fc
+ * starts in MPT IO Frames
b312fc
+ */
b312fc
+struct RAID_CONTEXT_G35 {
b312fc
+#if   defined(__BIG_ENDIAN_BITFIELD)
b312fc
+	u16	resvd0:8;
b312fc
+	u16	nseg:4;
b312fc
+	u16	type:4;
b312fc
+#else
b312fc
+	u16	type:4;		    /* 0x00 */
b312fc
+	u16	nseg:4;		    /* 0x00 */
b312fc
+	u16 resvd0:8;
b312fc
+#endif
b312fc
+	u16 timeout_value; /* 0x02 -0x03 */
b312fc
+	union {
b312fc
+		struct {
b312fc
+#if	defined(__BIG_ENDIAN_BITFIELD)
b312fc
+		u16	set_divert:4;
b312fc
+		u16	cpu_sel:4;
b312fc
+		u16	log:1;
b312fc
+		u16	rw:1;
b312fc
+		u16	sbs:1;
b312fc
+		u16	sqn:1;
b312fc
+		u16	fwn:1;
b312fc
+		u16	c2f:1;
b312fc
+		u16	sld:1;
b312fc
+		u16	reserved:1;
b312fc
+#else
b312fc
+		u16	reserved:1;
b312fc
+		u16	sld:1;
b312fc
+		u16	c2f:1;
b312fc
+		u16	fwn:1;
b312fc
+		u16	sqn:1;
b312fc
+		u16	sbs:1;
b312fc
+		u16	rw:1;
b312fc
+		u16	log:1;
b312fc
+		u16	cpu_sel:4;
b312fc
+		u16	set_divert:4;
b312fc
+#endif
b312fc
+			} bits;
b312fc
+		u16 s;
b312fc
+	} routing_flags;	/* 0x04 -0x05 routing flags */
b312fc
+	u16 virtual_disk_tgt_id;   /* 0x06 -0x07 */
b312fc
+	u64 reg_lock_row_lba;      /* 0x08 - 0x0F */
b312fc
+	u32 reg_lock_length;      /* 0x10 - 0x13 */
b312fc
+	union {
b312fc
+		u16 next_lmid; /* 0x14 - 0x15 */
b312fc
+		u16	peer_smid;	/* used for the raid 1/10 fp writes */
b312fc
+	} smid;
b312fc
+	u8 ex_status;       /* 0x16 : OUT */
b312fc
+	u8 status;          /* 0x17 status */
b312fc
+	u8 RAIDFlags;		/* 0x18 resvd[7:6], ioSubType[5:4],
b312fc
+				 * resvd[3:1], preferredCpu[0]
b312fc
+				 */
b312fc
+	u8 span_arm;            /* 0x1C span[7:5], arm[4:0] */
b312fc
+	u16	config_seq_num;           /* 0x1A -0x1B */
b312fc
+#if   defined(__BIG_ENDIAN_BITFIELD) /* 0x1C - 0x1D */
b312fc
+	u16 stream_detected:1;
b312fc
+	u16 reserved:3;
b312fc
+	u16 num_sge:12;
b312fc
+#else
b312fc
+	u16 num_sge:12;
b312fc
+	u16 reserved:3;
b312fc
+	u16 stream_detected:1;
b312fc
+#endif
b312fc
+	u8 resvd2[2];          /* 0x1E-0x1F */
b312fc
+};
b312fc
+
b312fc
+union RAID_CONTEXT_UNION {
b312fc
+	struct RAID_CONTEXT raid_context;
b312fc
+	struct RAID_CONTEXT_G35 raid_context_g35;
b312fc
+};
b312fc
+
b312fc
 #define RAID_CTX_SPANARM_ARM_SHIFT	(0)
b312fc
 #define RAID_CTX_SPANARM_ARM_MASK	(0x1f)
b312fc
 
b312fc
 #define RAID_CTX_SPANARM_SPAN_SHIFT	(5)
b312fc
 #define RAID_CTX_SPANARM_SPAN_MASK	(0xE0)
b312fc
 
b312fc
+/* number of bits per index in U32 TrackStream */
b312fc
+#define BITS_PER_INDEX_STREAM		4
b312fc
+#define INVALID_STREAM_NUM              16
b312fc
+#define MR_STREAM_BITMAP		0x76543210
b312fc
+#define STREAM_MASK			((1 << BITS_PER_INDEX_STREAM) - 1)
b312fc
+#define ZERO_LAST_STREAM		0x0fffffff
b312fc
+#define MAX_STREAMS_TRACKED		8
b312fc
+
b312fc
 /*
b312fc
  * define region lock types
b312fc
  */
b312fc
@@ -409,7 +492,7 @@ struct MPI2_RAID_SCSI_IO_REQUEST {
b312fc
 	u8                      LUN[8];                         /* 0x34 */
b312fc
 	__le32			Control;                        /* 0x3C */
b312fc
 	union MPI2_SCSI_IO_CDB_UNION  CDB;			/* 0x40 */
b312fc
-	struct RAID_CONTEXT	RaidContext;                    /* 0x60 */
b312fc
+	union RAID_CONTEXT_UNION RaidContext;  /* 0x60 */
b312fc
 	union MPI2_SGE_IO_UNION       SGL;			/* 0x80 */
b312fc
 };
b312fc
 
b312fc
@@ -656,11 +739,13 @@ struct MR_LD_RAID {
b312fc
 		u32     encryptionType:8;
b312fc
 		u32     pdPiMode:4;
b312fc
 		u32     ldPiMode:4;
b312fc
-		u32     reserved5:3;
b312fc
+		u32 reserved5:2;
b312fc
+		u32 ra_capable:1;
b312fc
 		u32     fpCapable:1;
b312fc
 #else
b312fc
 		u32     fpCapable:1;
b312fc
-		u32     reserved5:3;
b312fc
+		u32 ra_capable:1;
b312fc
+		u32 reserved5:2;
b312fc
 		u32     ldPiMode:4;
b312fc
 		u32     pdPiMode:4;
b312fc
 		u32     encryptionType:8;
b312fc
@@ -745,6 +830,7 @@ struct IO_REQUEST_INFO {
b312fc
 	u64 start_row;
b312fc
 	u8  span_arm;	/* span[7:5], arm[4:0] */
b312fc
 	u8  pd_after_lb;
b312fc
+	bool ra_capable;
b312fc
 };
b312fc
 
b312fc
 struct MR_LD_TARGET_SYNC {
b312fc
@@ -930,6 +1016,30 @@ struct MR_PD_CFG_SEQ_NUM_SYNC {
b312fc
 	struct MR_PD_CFG_SEQ seq[1];
b312fc
 } __packed;
b312fc
 
b312fc
+/* stream detection */
b312fc
+struct STREAM_DETECT {
b312fc
+	u64 next_seq_lba; /* next LBA to match sequential access */
b312fc
+	struct megasas_cmd_fusion *first_cmd_fusion; /* first cmd in group */
b312fc
+	struct megasas_cmd_fusion *last_cmd_fusion; /* last cmd in group */
b312fc
+	u32 count_cmds_in_stream; /* count of host commands in this stream */
b312fc
+	u16 num_sges_in_group; /* total number of SGEs in grouped IOs */
b312fc
+	u8 is_read; /* SCSI OpCode for this stream */
b312fc
+	u8 group_depth; /* total number of host commands in group */
b312fc
+	/* TRUE if cannot add any more commands to this group */
b312fc
+	bool group_flush;
b312fc
+	u8 reserved[7]; /* pad to 64-bit alignment */
b312fc
+};
b312fc
+
b312fc
+struct LD_STREAM_DETECT {
b312fc
+	bool write_back; /* TRUE if WB, FALSE if WT */
b312fc
+	bool fp_write_enabled;
b312fc
+	bool members_ssds;
b312fc
+	bool fp_cache_bypass_capable;
b312fc
+	u32 mru_bit_map; /* bitmap used to track MRU and LRU stream indicies */
b312fc
+	/* this is the array of stream detect structures (one per stream) */
b312fc
+	struct STREAM_DETECT stream_track[MAX_STREAMS_TRACKED];
b312fc
+};
b312fc
+
b312fc
 struct MPI2_IOC_INIT_RDPQ_ARRAY_ENTRY {
b312fc
 	u64 RDPQBaseAddress;
b312fc
 	u32 Reserved1;
b312fc
@@ -983,6 +1093,7 @@ struct fusion_context {
b312fc
 	struct LD_LOAD_BALANCE_INFO load_balance_info[MAX_LOGICAL_DRIVES_EXT];
b312fc
 	LD_SPAN_INFO log_to_span[MAX_LOGICAL_DRIVES_EXT];
b312fc
 	u8 adapter_type;
b312fc
+	struct LD_STREAM_DETECT **stream_detect_by_ld;
b312fc
 };
b312fc
 
b312fc
 union desc_value {
b312fc
-- 
b312fc
1.8.3.1
b312fc