diff options
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas.h')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.h | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index eaec9d531424..d6d166c0663f 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h | |||
@@ -18,10 +18,9 @@ | |||
18 | /** | 18 | /** |
19 | * MegaRAID SAS Driver meta data | 19 | * MegaRAID SAS Driver meta data |
20 | */ | 20 | */ |
21 | #define MEGASAS_VERSION "00.00.02.00-rc4" | 21 | #define MEGASAS_VERSION "00.00.02.02" |
22 | #define MEGASAS_RELDATE "Sep 16, 2005" | 22 | #define MEGASAS_RELDATE "Jan 23, 2006" |
23 | #define MEGASAS_EXT_VERSION "Fri Sep 16 12:37:08 EDT 2005" | 23 | #define MEGASAS_EXT_VERSION "Mon Jan 23 14:09:01 PST 2006" |
24 | |||
25 | /* | 24 | /* |
26 | * ===================================== | 25 | * ===================================== |
27 | * MegaRAID SAS MFI firmware definitions | 26 | * MegaRAID SAS MFI firmware definitions |
@@ -1013,6 +1012,16 @@ struct megasas_evt_detail { | |||
1013 | 1012 | ||
1014 | } __attribute__ ((packed)); | 1013 | } __attribute__ ((packed)); |
1015 | 1014 | ||
1015 | struct megasas_instance_template { | ||
1016 | void (*fire_cmd)(dma_addr_t ,u32 ,struct megasas_register_set __iomem *); | ||
1017 | |||
1018 | void (*enable_intr)(struct megasas_register_set __iomem *) ; | ||
1019 | |||
1020 | int (*clear_intr)(struct megasas_register_set __iomem *); | ||
1021 | |||
1022 | u32 (*read_fw_status_reg)(struct megasas_register_set __iomem *); | ||
1023 | }; | ||
1024 | |||
1016 | struct megasas_instance { | 1025 | struct megasas_instance { |
1017 | 1026 | ||
1018 | u32 *producer; | 1027 | u32 *producer; |
@@ -1056,6 +1065,8 @@ struct megasas_instance { | |||
1056 | u32 fw_outstanding; | 1065 | u32 fw_outstanding; |
1057 | u32 hw_crit_error; | 1066 | u32 hw_crit_error; |
1058 | spinlock_t instance_lock; | 1067 | spinlock_t instance_lock; |
1068 | |||
1069 | struct megasas_instance_template *instancet; | ||
1059 | }; | 1070 | }; |
1060 | 1071 | ||
1061 | #define MEGASAS_IS_LOGICAL(scp) \ | 1072 | #define MEGASAS_IS_LOGICAL(scp) \ |
@@ -1125,11 +1136,10 @@ struct compat_megasas_iocpacket { | |||
1125 | struct compat_iovec sgl[MAX_IOCTL_SGE]; | 1136 | struct compat_iovec sgl[MAX_IOCTL_SGE]; |
1126 | } __attribute__ ((packed)); | 1137 | } __attribute__ ((packed)); |
1127 | 1138 | ||
1128 | #define MEGASAS_IOC_FIRMWARE _IOWR('M', 1, struct compat_megasas_iocpacket) | ||
1129 | #else | ||
1130 | #define MEGASAS_IOC_FIRMWARE _IOWR('M', 1, struct megasas_iocpacket) | ||
1131 | #endif | 1139 | #endif |
1132 | 1140 | ||
1141 | #define MEGASAS_IOC_FIRMWARE _IOWR('M', 1, struct megasas_iocpacket) | ||
1142 | #define MEGASAS_IOC_FIRMWARE32 _IOWR('M', 1, struct compat_megasas_iocpacket) | ||
1133 | #define MEGASAS_IOC_GET_AEN _IOW('M', 3, struct megasas_aen) | 1143 | #define MEGASAS_IOC_GET_AEN _IOW('M', 3, struct megasas_aen) |
1134 | 1144 | ||
1135 | struct megasas_mgmt_info { | 1145 | struct megasas_mgmt_info { |