Merge branch 'master'

1 files changed, 48 insertions, 23 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index eaec9d531424..89639f0c38ef 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -18,10 +18,9 @@
 /**
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION                         "00.00.02.00-rc4"
-#define MEGASAS_RELDATE                         "Sep 16, 2005"
-#define MEGASAS_EXT_VERSION                     "Fri Sep 16 12:37:08 EDT 2005"
-
+#define MEGASAS_VERSION                         "00.00.02.04"
+#define MEGASAS_RELDATE                         "Feb 03, 2006"
+#define MEGASAS_EXT_VERSION                     "Fri Feb 03 14:31:44 PST 2006"
 /*
  * =====================================
  * MegaRAID SAS MFI firmware definitions
@@ -554,31 +553,46 @@ struct megasas_ctrl_info {
 #define MFI_OB_INTR_STATUS_MASK                 0x00000002
 #define MFI_POLL_TIMEOUT_SECS                   10
 
+#define MFI_REPLY_1078_MESSAGE_INTERRUPT        0x80000000
+#define PCI_DEVICE_ID_LSI_SAS1078R              0x00000060
+ 
 struct megasas_register_set {
+        u32     reserved_0[4];                  /*0000h*/
+
+        u32     inbound_msg_0;                  /*0010h*/
+        u32     inbound_msg_1;                  /*0014h*/
+        u32     outbound_msg_0;                 /*0018h*/
+        u32     outbound_msg_1;                 /*001Ch*/
+
+        u32     inbound_doorbell;               /*0020h*/
+        u32     inbound_intr_status;            /*0024h*/
+        u32     inbound_intr_mask;              /*0028h*/
+
+        u32     outbound_doorbell;              /*002Ch*/
+        u32     outbound_intr_status;           /*0030h*/
+        u32     outbound_intr_mask;             /*0034h*/
 
-        u32 reserved_0[4];      /*0000h */
+        u32     reserved_1[2];                  /*0038h*/
 
-        u32 inbound_msg_0;      /*0010h */
-        u32 inbound_msg_1;      /*0014h */
-        u32 outbound_msg_0;     /*0018h */
-        u32 outbound_msg_1;     /*001Ch */
+        u32     inbound_queue_port;             /*0040h*/
+        u32     outbound_queue_port;            /*0044h*/
 
-        u32 inbound_doorbell;   /*0020h */
-        u32 inbound_intr_status;        /*0024h */
-        u32 inbound_intr_mask;  /*0028h */
+        u32     reserved_2[22];                 /*0048h*/
 
-        u32 outbound_doorbell;  /*002Ch */
-        u32 outbound_intr_status;       /*0030h */
-        u32 outbound_intr_mask; /*0034h */
+        u32     outbound_doorbell_clear;        /*00A0h*/
 
-        u32 reserved_1[2];      /*0038h */
+        u32     reserved_3[3];                  /*00A4h*/
 
-        u32 inbound_queue_port; /*0040h */
-        u32 outbound_queue_port;        /*0044h */
+        u32     outbound_scratch_pad ;          /*00B0h*/
 
-        u32 reserved_2;         /*004Ch */
+        u32     reserved_4[3];                  /*00B4h*/
 
-        u32 index_registers[1004];      /*0050h */
+        u32     inbound_low_queue_port ;        /*00C0h*/
+
+        u32     inbound_high_queue_port ;       /*00C4h*/
+
+        u32     reserved_5;                     /*00C8h*/
+        u32     index_registers[820];           /*00CCh*/
 
 } __attribute__ ((packed));
 
@@ -1013,6 +1027,16 @@ struct megasas_evt_detail {
 
 } __attribute__ ((packed));
 
+ struct megasas_instance_template {
+        void (*fire_cmd)(dma_addr_t ,u32 ,struct megasas_register_set __iomem *);
+
+        void (*enable_intr)(struct megasas_register_set __iomem *) ;
+
+        int (*clear_intr)(struct megasas_register_set __iomem *);
+
+        u32 (*read_fw_status_reg)(struct megasas_register_set __iomem *);
+ };
+
 struct megasas_instance {
 
         u32 *producer;
@@ -1056,6 +1080,8 @@ struct megasas_instance {
         u32 fw_outstanding;
         u32 hw_crit_error;
         spinlock_t instance_lock;
+
+        struct megasas_instance_template *instancet;
 };
 
 #define MEGASAS_IS_LOGICAL(scp)                                         \
@@ -1125,11 +1151,10 @@ struct compat_megasas_iocpacket {
         struct compat_iovec sgl[MAX_IOCTL_SGE];
 } __attribute__ ((packed));
 
-#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct compat_megasas_iocpacket)
-#else
-#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct megasas_iocpacket)
 #endif
 
+#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct megasas_iocpacket)
+#define MEGASAS_IOC_FIRMWARE32  _IOWR('M', 1, struct compat_megasas_iocpacket)
 #define MEGASAS_IOC_GET_AEN     _IOW('M', 3, struct megasas_aen)
 
 struct megasas_mgmt_info {