Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[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 2b5a3285f799829b840baf04d603e03dc8835ec9..c1d86d961a92df976c63da2dfa0cbd39d1babc52 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.9"
-#define MEGARAID_EXT_VERSION   "(Release Date: Sun Jul 16 12:27:22 EST 2006)"
+#define MEGARAID_VERSION       "2.20.5.1"
+#define MEGARAID_EXT_VERSION   "(Release Date: Thu Nov 16 15:32:35 EST 2006)"
 
 
 /*
@@ -88,6 +88,7 @@
 #define PCI_SUBSYS_ID_PERC3_QC                         0x0471
 #define PCI_SUBSYS_ID_PERC3_DC                         0x0493
 #define PCI_SUBSYS_ID_PERC3_SC                         0x0475
+#define PCI_SUBSYS_ID_CERC_ATA100_4CH                  0x0511
 
 
 #define MBOX_MAX_SCSI_CMDS     128     // number of cmds reserved for kernel
@@ -146,29 +147,29 @@ 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_mtx                  : mutex to serialize access to sysfs res.
  * @sysfs_uioc                 : management packet to issue FW calls from sysfs
  * @sysfs_mbox64               : mailbox packet to issue FW calls from sysfs
  * @sysfs_buffer               : data buffer for FW commands issued from sysfs
@@ -208,7 +209,7 @@ typedef struct {
        int                             hw_error;
        int                             fast_load;
        uint8_t                         channel_class;
-       struct semaphore                sysfs_sem;
+       struct mutex                    sysfs_mtx;
        uioc_t                          *sysfs_uioc;
        mbox64_t                        *sysfs_mbox64;
        caddr_t                         sysfs_buffer;