Merge tag 'for-linus-5.6-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubca...

[linux.git] / drivers / scsi / megaraid / megaraid_sas_fusion.h

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h
index c013c80fe4e6d3fa321ea708657794f08025888d..d57ecc7f88d8afec2473e7c1374d5d1bfb10fdd4 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.h
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h
@@ -89,6 +89,7 @@ enum MR_RAID_FLAGS_IO_SUB_TYPE {
 
 #define MEGASAS_FP_CMD_LEN     16
 #define MEGASAS_FUSION_IN_RESET 0
+#define MEGASAS_FUSION_OCR_NOT_POSSIBLE 1
 #define RAID_1_PEER_CMDS 2
 #define JBOD_MAPS_COUNT        2
 #define MEGASAS_REDUCE_QD_COUNT 64
@@ -864,9 +865,20 @@ struct MR_LD_RAID {
        u8      regTypeReqOnRead;
        __le16     seqNum;
 
-       struct {
-               u32 ldSyncRequired:1;
-               u32 reserved:31;
+struct {
+#ifndef MFI_BIG_ENDIAN
+       u32 ldSyncRequired:1;
+       u32 regTypeReqOnReadIsValid:1;
+       u32 isEPD:1;
+       u32 enableSLDOnAllRWIOs:1;
+       u32 reserved:28;
+#else
+       u32 reserved:28;
+       u32 enableSLDOnAllRWIOs:1;
+       u32 isEPD:1;
+       u32 regTypeReqOnReadIsValid:1;
+       u32 ldSyncRequired:1;
+#endif
        } flags;
 
        u8      LUN[8]; /* 0x24 8 byte LUN field used for SCSI IO's */