megaraid_sas: Synchronize driver headers with firmware APIs

Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
Signed-off-by: Kashyap Desai <kashyap.desai@avagotech.com>
Reviewed-by: Martin Petersen <martin.petersen@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 20c37541963f4acd04ed6836647469f3d46cdabe..b0d373d90de6b821469fb6b96b05915bb9ca2dfd 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -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;

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h
index ced6dc0cf8e8ab7bf6e00ec1710ee24a5e802a4e..be1be8e1a0e99b69aedf99607307584009f16e54 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.h
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h
@@ -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)