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

Commit 0be3f4c9 authored by sumit.saxena@avagotech.com's avatar sumit.saxena@avagotech.com Committed by Martin K. Petersen
Browse files

megaraid_sas: Synchronize driver headers with firmware APIs 



Signed-off-by: default avatarSumit Saxena <sumit.saxena@avagotech.com>
Signed-off-by: default avatarKashyap Desai <kashyap.desai@avagotech.com>
Reviewed-by: default avatarMartin Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b704f70c

drivers/scsi/megaraid/megaraid_sas.h

+14 −4
Original line number Diff line number Diff line
@@ -973,7 +973,11 @@ struct megasas_ctrl_info { 


	struct {

#if defined(__BIG_ENDIAN_BITFIELD)

		u32     reserved:12;

		u32     reserved:8;

		u32     supportExtendedSSCSize:1;

		u32     supportDiskCacheSettingForSysPDs:1;

		u32     supportCPLDUpdate:1;

		u32     supportTTYLogCompression:1;

		u32     discardCacheDuringLDDelete:1;

		u32     supportSecurityonJBOD:1;

		u32     supportCacheBypassModes:1;
@@ -1013,7 +1017,11 @@ struct megasas_ctrl_info { 
		u32     supportCacheBypassModes:1;

		u32     supportSecurityonJBOD:1;

		u32     discardCacheDuringLDDelete:1;

		u32     reserved:12;

		u32     supportTTYLogCompression:1;

		u32     supportCPLDUpdate:1;

		u32     supportDiskCacheSettingForSysPDs:1;

		u32     supportExtendedSSCSize:1;

		u32     reserved:8;

#endif

	} adapterOperations3;
@@ -1229,7 +1237,8 @@ union megasas_sgl_frame { 
typedef union _MFI_CAPABILITIES {

	struct {

#if   defined(__BIG_ENDIAN_BITFIELD)

		u32     reserved:25;

		u32     reserved:24;

		u32	support_ext_queue_depth:1;

		u32     security_protocol_cmds_fw:1;

		u32     support_core_affinity:1;

		u32     support_ndrive_r1_lb:1;
@@ -1245,7 +1254,8 @@ typedef union _MFI_CAPABILITIES { 
		u32     support_ndrive_r1_lb:1;

		u32     support_core_affinity:1;

		u32     security_protocol_cmds_fw:1;

		u32     reserved:25;

		u32	support_ext_queue_depth:1;

		u32     reserved:24;

#endif

	} mfi_capabilities;

	__le32		reg;

drivers/scsi/megaraid/megaraid_sas_fusion.h

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ struct RAID_CONTEXT { 
	u8      numSGE;

	__le16	configSeqNum;

	u8      spanArm;

	u8      resvd2[3];

	u8      priority;

	u8      resvd2[2];

};



#define RAID_CTX_SPANARM_ARM_SHIFT	(0)