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

Commit 2c048351 authored by Sumit Saxena's avatar Sumit Saxena Committed by Martin K. Petersen
Browse files

megaraid_sas: Syncing request flags macro names with firmware 



Signed-off-by: default avatarSumit Saxena <sumit.saxena@avagotech.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6d40afbc

drivers/scsi/megaraid/megaraid_sas_fusion.c

+3 −3
Original line number Diff line number Diff line
@@ -1666,7 +1666,7 @@ megasas_build_ldio_fusion(struct megasas_instance *instance, 
				   local_map_ptr, start_lba_lo);

		io_request->Function = MPI2_FUNCTION_SCSI_IO_REQUEST;

		cmd->request_desc->SCSIIO.RequestFlags =

			(MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY

			(MPI2_REQ_DESCRIPT_FLAGS_FP_IO

			 << MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);

		if (fusion->adapter_type == INVADER_SERIES) {

			if (io_request->RaidContext.regLockFlags ==
@@ -1799,7 +1799,7 @@ static void megasas_build_ld_nonrw_fusion(struct megasas_instance *instance, 


		/* build request descriptor */

		cmd->request_desc->SCSIIO.RequestFlags =

			(MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY <<

			(MPI2_REQ_DESCRIPT_FLAGS_FP_IO <<

			MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);

		cmd->request_desc->SCSIIO.DevHandle = devHandle;
@@ -1905,7 +1905,7 @@ megasas_build_syspd_fusion(struct megasas_instance *instance, 
				cpu_to_le16(MPI25_SAS_DEVICE0_FLAGS_ENABLED_FAST_PATH);

		}

		cmd->request_desc->SCSIIO.RequestFlags =

			(MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY <<

			(MPI2_REQ_DESCRIPT_FLAGS_FP_IO <<

				MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);

	}

}

drivers/scsi/megaraid/megaraid_sas_fusion.h

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ enum REGION_TYPE { 
#define MPI2_SCSIIO_EEDPFLAGS_CHECK_GUARD           (0x0100)

#define MPI2_SCSIIO_EEDPFLAGS_INSERT_OP             (0x0004)

#define MPI2_FUNCTION_SCSI_IO_REQUEST               (0x00) /* SCSI IO */

#define MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY           (0x06)

#define MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY       (0x03)

#define MPI2_REQ_DESCRIPT_FLAGS_FP_IO               (0x06)

#define MPI2_REQ_DESCRIPT_FLAGS_SCSI_IO                 (0x00)

#define MPI2_SGE_FLAGS_64_BIT_ADDRESSING        (0x02)

#define MPI2_SCSIIO_CONTROL_WRITE               (0x01000000)