Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / drivers / scsi / megaraid / megaraid_mbox.h

diff --git a/drivers/scsi/megaraid/megaraid_mbox.h b/drivers/scsi/megaraid/megaraid_mbox.h
index 882fb1a0b57560ca493fc6cc7e16cb2d4e1a0d66..9de803cebd4badec858161d679a0b85905b9026a 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.h
+++ b/drivers/scsi/megaraid/megaraid_mbox.h
@@ -21,8 +21,8 @@
 #include "megaraid_ioctl.h"
 
 
-#define MEGARAID_VERSION       "2.20.4.7"
-#define MEGARAID_EXT_VERSION   "(Release Date: Mon Nov 14 12:27:22 EST 2005)"
+#define MEGARAID_VERSION       "2.20.5.1"
+#define MEGARAID_EXT_VERSION   "(Release Date: Thu Nov 16 15:32:35 EST 2006)"
 
 
 /*
@@ -100,6 +100,9 @@
 #define MBOX_BUSY_WAIT         10      // max usec to wait for busy mailbox
 #define MBOX_RESET_WAIT                180     // wait these many seconds in reset
 #define MBOX_RESET_EXT_WAIT    120     // extended wait reset
+#define MBOX_SYNC_WAIT_CNT     0xFFFF  // wait loop index for synchronous mode
+
+#define MBOX_SYNC_DELAY_200    200     // 200 micro-seconds
 
 /*
  * maximum transfer that can happen through the firmware commands issued
@@ -143,27 +146,27 @@ typedef struct {
 
 /**
  * mraid_device_t - adapter soft state structure for mailbox controllers
- * @param una_mbox64           : 64-bit mbox - unaligned
- * @param una_mbox64_dma       : mbox dma addr - unaligned
- * @param mbox                 : 32-bit mbox - aligned
- * @param mbox64               : 64-bit mbox - aligned
- * @param mbox_dma             : mbox dma addr - aligned
- * @param mailbox_lock         : exclusion lock for the mailbox
- * @param baseport             : base port of hba memory
- * @param baseaddr             : mapped addr of hba memory
- * @param mbox_pool            : pool of mailboxes
- * @param mbox_pool_handle     : handle for the mailbox pool memory
- * @param epthru_pool          : a pool for extended passthru commands
- * @param epthru_pool_handle   : handle to the pool above
- * @param sg_pool              : pool of scatter-gather lists for this driver
- * @param sg_pool_handle       : handle to the pool above
- * @param ccb_list             : list of our command control blocks
- * @param uccb_list            : list of cmd control blocks for mgmt module
- * @param umbox64              : array of mailbox for user commands (cmm)
- * @param pdrv_state           : array for state of each physical drive.
- * @param last_disp            : flag used to show device scanning
- * @param hw_error             : set if FW not responding
- * @param fast_load            : If set, skip physical device scanning
+ * @una_mbox64                 : 64-bit mbox - unaligned
+ * @una_mbox64_dma             : mbox dma addr - unaligned
+ * @mbox                       : 32-bit mbox - aligned
+ * @mbox64                     : 64-bit mbox - aligned
+ * @mbox_dma                   : mbox dma addr - aligned
+ * @mailbox_lock               : exclusion lock for the mailbox
+ * @baseport                   : base port of hba memory
+ * @baseaddr                   : mapped addr of hba memory
+ * @mbox_pool                  : pool of mailboxes
+ * @mbox_pool_handle           : handle for the mailbox pool memory
+ * @epthru_pool                        : a pool for extended passthru commands
+ * @epthru_pool_handle         : handle to the pool above
+ * @sg_pool                    : pool of scatter-gather lists for this driver
+ * @sg_pool_handle             : handle to the pool above
+ * @ccb_list                   : list of our command control blocks
+ * @uccb_list                  : list of cmd control blocks for mgmt module
+ * @umbox64                    : array of mailbox for user commands (cmm)
+ * @pdrv_state                 : array for state of each physical drive.
+ * @last_disp                  : flag used to show device scanning
+ * @hw_error                   : set if FW not responding
+ * @fast_load                  : If set, skip physical device scanning
  * @channel_class              : channel class, RAID or SCSI
  * @sysfs_sem                  : semaphore to serialize access to sysfs res.
  * @sysfs_uioc                 : management packet to issue FW calls from sysfs